From e40ca676eee20fa6ea8b5ac36b3a858481ed9d79 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon, 8 Dec 2025 22:20:46 +0100
Subject: [PATCH] ucode: update to Git HEAD (2025-12-01)

afe4be60628a lib/fs: fix return value for flush
5f08ecf8e372 lib/uloop: fix return value doc for run()
1affe484f302 lib/uloop: pass eof and error to cb
559860cbd76d lib: introduce io library
ef07e2448a56 vm: optimize string+string concat with ucv_string_alloc

Changes: https://github.com/jow-/ucode/compare/48ed18d2532e9197212c34473ab926c7b5e8ac73...f7c2b97a82e8b505bf4b2c0d8883b5116e1960f9

Backport PR to fix compilation with Ubuntu 18.04:
https://github.com/jow-/ucode/pull/355

Link: https://github.com/openwrt/openwrt/pull/21100
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 package/utils/ucode/Makefile                  |  6 +++---
 .../100-add-include-for-older-kernels.patch   | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 package/utils/ucode/patches/100-add-include-for-older-kernels.patch

diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile
index 1ca10cb88d..abc0c31e6f 100644
--- a/package/utils/ucode/Makefile
+++ b/package/utils/ucode/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/jow-/ucode.git
-PKG_SOURCE_DATE:=2025-11-19
-PKG_SOURCE_VERSION:=48ed18d2532e9197212c34473ab926c7b5e8ac73
-PKG_MIRROR_HASH:=34529706bcb413dffb3d73e78fe97971bd2b518c097c86470edadc1ca79a480c
+PKG_SOURCE_DATE:=2025-12-01
+PKG_SOURCE_VERSION:=f7c2b97a82e8b505bf4b2c0d8883b5116e1960f9
+PKG_MIRROR_HASH:=7de6a6d5b3c7392624bccefdc03e2dc61f097b414989eeced29ecc3e020bbd0b
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=ISC
 
diff --git a/package/utils/ucode/patches/100-add-include-for-older-kernels.patch b/package/utils/ucode/patches/100-add-include-for-older-kernels.patch
new file mode 100644
index 0000000000..f047bed928
--- /dev/null
+++ b/package/utils/ucode/patches/100-add-include-for-older-kernels.patch
@@ -0,0 +1,20 @@
+From 165d395ffa2a22e293160b24d4791302a156eab8 Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Mon, 8 Dec 2025 12:48:01 -0800
+Subject: add include for older kernels
+
+in6.h is needed for some macros. Seems newer kernels include this implicitly.
+---
+ lib/socket.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/lib/socket.c
++++ b/lib/socket.c
+@@ -77,6 +77,7 @@
+ #include "ucode/platform.h"
+ 
+ #if defined(__linux__)
++# include <linux/in6.h>
+ # include <linux/if_packet.h>
+ # include <linux/filter.h>
+ 
-- 
2.30.2